No more mushroom

svn path=/trunk/; revision=20745

diff --git a/ChangeLog b/ChangeLog
index 9583eef974e14dbc542708ebff91ca4e3196f083..9230eca589f02e65abf963b751de79d646fe89aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-03  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 538547 – Update doc-shooter in gtk documentation
+
+       * docs/tools/Makefile.am:
+       * docs/tools/folder.png:
+       * docs/tools/gnome.png: New images
+
+       * docs/tools/widgets.c: Use the new images.
+       Patch by Baptiste Mille-Mathias.
+
 2008-07-03  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkscalebutton.c: remove "_from_bindings" suffix from the

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 9abc3102d46a03cc10b1a2a0b7c435851104a936..d9e48efca128344a6d1ec37f7e66c8373ec1e52b 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/images/iconview.png: Update
+
 2008-06-13  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.13.3 ===

diff --git a/docs/reference/gtk/images/icon-view.png b/docs/reference/gtk/images/icon-view.png
index 4617ec63aa5e7f75add87f8c40f3209d8820445e..9c993296eb4078ffd5fa97f35737b85fbe956327 100644 (file)
Binary files a/docs/reference/gtk/images/icon-view.png and b/docs/reference/gtk/images/icon-view.png differ

diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 8a555ba0b20d5a31711592d9da8f393934a37631..4b781426450ebec9f2ece97bde4bdc396464f6fe 100644 (file)
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -34,9 +34,9 @@ doc_shooter_SOURCES=  \
        widgets.h
 
 clean-local:
-       for file in gnome-foot.png *.png; do \
+       for file in *.png; do \
          case "$$file" in \
-           gnome-foot.png|gnome-gmush.png) ;; \
+           folder.png|gnome.png) ;; \
            *) rm -f $$file ;; \
          esac ; \
        done

diff --git a/docs/tools/folder.png b/docs/tools/folder.png
new file mode 100644 (file)
index 0000000..444d906
Binary files /dev/null and b/docs/tools/folder.png differ

diff --git a/docs/tools/gnome.png b/docs/tools/gnome.png
new file mode 100644 (file)
index 0000000..fbe2a21
Binary files /dev/null and b/docs/tools/gnome.png differ

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 9abeb2797a439e2eaecc0dc618ba224484166163..ae75f3104b2feb59b9b2ca6706d0647862b043d1 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -396,10 +396,10 @@ create_icon_view (void)
   gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN);
   list_store = gtk_list_store_new (2, G_TYPE_STRING, GDK_TYPE_PIXBUF);
   gtk_list_store_append (list_store, &iter);
-  pixbuf = gdk_pixbuf_new_from_file ("gnome-gmush.png", NULL);
+  pixbuf = gdk_pixbuf_new_from_file ("folder.png", NULL);
   gtk_list_store_set (list_store, &iter, 0, "One", 1, pixbuf, -1);
   gtk_list_store_append (list_store, &iter);
-  pixbuf = gdk_pixbuf_new_from_file ("gnome-foot.png", NULL);
+  pixbuf = gdk_pixbuf_new_from_file ("gnome.png", NULL);
   gtk_list_store_set (list_store, &iter, 0, "Two", 1, pixbuf, -1);
 
   icon_view = gtk_icon_view_new();